bail out if last_window is not a GdkWindow anymore. (Fixes #434021,

2007-06-06  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktooltip.c (gtk_tooltip_show_tooltip): bail out if
	last_window is not a GdkWindow anymore. (Fixes #434021, several
	reporters).

svn path=/trunk/; revision=18051

diff --git a/ChangeLog b/ChangeLog
index 51b1e1cb6e24edf2e23c167c2ff4d0a660082455..77225365f0821772aa2e0d3d3409aa80d14932be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-06  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktooltip.c (gtk_tooltip_show_tooltip): bail out if
+       last_window is not a GdkWindow anymore. (Fixes #434021, several
+       reporters).
+
 2007-06-06  Brian Cameron  <brian.cameron@sun.com>
 
        * gdk/Makefile.am: Add gdkmedialib.h to EXTRA_DIST so this header

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 1df772f7d3b4f4527196770ddaa068c79fe1e667..69685d566f262db794f6b50bcd13388ff3ac06ab 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -634,13 +634,13 @@ gtk_tooltip_show_tooltip (GdkDisplay *display)
     {
       window = tooltip->last_window;
 
+      if (!GDK_IS_WINDOW (window))
+       return;
+
       gdk_window_get_origin (window, &x, &y);
       x = tooltip->last_x - x;
       y = tooltip->last_y - y;
 
-      if (!window)
-       return;
-
       pointer_widget = tooltip_widget = find_widget_under_pointer (window,
                                                                   &x, &y);
     }